Delete saplus

diff --git a/deprecated/style/saplus.style b/deprecated/style/saplus.style
new file mode 100644 (file)
index 0000000..76da425
--- /dev/null
+++ b/deprecated/style/saplus.style
@@ -0,0 +1,28 @@
+# gpsbabel XCSV style file
+#
+# Format:
+# Author: Jim Bensman
+#   Date: 02/22/04
+#
+
+DESCRIPTION             DeLorme Street Atlas Plus
+
+#
+# FILE LAYOUT DEFINITIIONS:
+#
+FIELD_DELIMITER         COMMA
+RECORD_DELIMITER        NEWLINE
+BADCHARS                ,"
+
+PROLOGUE        Name 2,Name,Latitude,Longitude,URL,Type
+
+#
+# INDIVIDUAL DATA FIELDS, IN ORDER OF APPEARANCE:
+#
+IFIELD  DESCRIPTION, "", "%s"           # Name 2 (Big Description)
+IFIELD  SHORTNAME, "", "%s"             # Name
+IFIELD  LAT_DECIMAL, "", "%f"           # Latitude
+IFIELD  LON_DECIMAL, "", "%f"           # Longitude
+IFIELD  URL, "", "%s"                   # URL
+IFIELD  IGNORE, "", ""                  # Holder for Geocache Type
+

diff --git a/gpsbabel.qrc b/gpsbabel.qrc
index 35a5fe76bbac5b95dadf2e5156b2e1c1ee02f67f..e50833678179f8aa757f93879b9ccc7293cb37dc 100644 (file)
--- a/gpsbabel.qrc
+++ b/gpsbabel.qrc
@@ -30,7 +30,6 @@
         <file>style/openoffice.style</file>
         <file>style/ricoh.style</file>
         <file>style/s_and_t.style</file>
-        <file>style/saplus.style</file>
         <file>style/tabsep.style</file>
         <file>style/tomtom_asc.style</file>
         <file>style/tomtom_itn_places.style</file>

diff --git a/reference/format0.txt b/reference/format0.txt
index e87ab3a7ca7bcccc23bd7b84172f410bab219893..4121030e7e9925e595b6a96d620e402336cbf8ba 100644 (file)
--- a/reference/format0.txt
+++ b/reference/format0.txt
@@ -5,7 +5,6 @@ csv             Comma separated values
 iblue747       csv     Data Logger iBlue747 csv
 iblue757       csv     Data Logger iBlue757 csv
 gpl    gpl     DeLorme GPL
-saplus         DeLorme Street Atlas Plus
 saroute        anr     DeLorme Street Atlas Route
 destinator_itn dat     Destinator Itineraries (.dat)
 destinator_poi dat     Destinator Points of Interest (.dat)

diff --git a/reference/format1.txt b/reference/format1.txt
index b041fb54876939bbaa0129f8ec18766613c10483..5788a3a324c9e5cfc3db8454c89f8d64c5b6fd09 100644 (file)
--- a/reference/format1.txt
+++ b/reference/format1.txt
@@ -8,7 +8,6 @@ internal        custom          Custom "Everything" Style
 file   iblue747        csv     Data Logger iBlue747 csv
 file   iblue757        csv     Data Logger iBlue757 csv
 file   gpl     gpl     DeLorme GPL
-file   saplus          DeLorme Street Atlas Plus
 file   saroute anr     DeLorme Street Atlas Route
 file   destinator_itn  dat     Destinator Itineraries (.dat)
 file   destinator_poi  dat     Destinator Points of Interest (.dat)

diff --git a/reference/format2.txt b/reference/format2.txt
index 4d37d6469b7582bc0fb3b6d16505c09443679986..6dfed0900e132706e3e7d4c15b0347d844dbfbc4 100644 (file)
--- a/reference/format2.txt
+++ b/reference/format2.txt
@@ -8,7 +8,6 @@ internal        rw----  custom          Custom "Everything" Style
 file   --rw--  iblue747        csv     Data Logger iBlue747 csv
 file   --rw--  iblue757        csv     Data Logger iBlue757 csv
 file   --rw--  gpl     gpl     DeLorme GPL
-file   rw----  saplus          DeLorme Street Atlas Plus
 file   --r---  saroute anr     DeLorme Street Atlas Route
 file   ----rw  destinator_itn  dat     Destinator Itineraries (.dat)
 file   rw----  destinator_poi  dat     Destinator Points of Interest (.dat)

diff --git a/reference/format3.txt b/reference/format3.txt
index 37282d4340b5c7fd783d361386f40b4e08d838b8..1112f52568cfb2c3fb6a7e761e46eda3a4400dd1 100644 (file)
--- a/reference/format3.txt
+++ b/reference/format3.txt
@@ -118,22 +118,6 @@ option     iblue757        datum   GPS datum (def. WGS 84) string                          https://www.gpsbabel.org
 
 file   --rw--  gpl     gpl     DeLorme GPL     gpl
        https://www.gpsbabel.org/WEB_DOC_DIR/fmt_gpl.html
-file   rw----  saplus          DeLorme Street Atlas Plus       xcsv
-       https://www.gpsbabel.org/WEB_DOC_DIR/fmt_saplus.html
-option saplus  snlen   Max synthesized shortname length        integer         1               https://www.gpsbabel.org/WEB_DOC_DIR/fmt_saplus.html#fmt_saplus_o_snlen
-
-option saplus  snwhite Allow whitespace synth. shortnames      boolean                         https://www.gpsbabel.org/WEB_DOC_DIR/fmt_saplus.html#fmt_saplus_o_snwhite
-
-option saplus  snupper UPPERCASE synth. shortnames     boolean                         https://www.gpsbabel.org/WEB_DOC_DIR/fmt_saplus.html#fmt_saplus_o_snupper
-
-option saplus  snunique        Make synth. shortnames unique   boolean                         https://www.gpsbabel.org/WEB_DOC_DIR/fmt_saplus.html#fmt_saplus_o_snunique
-
-option saplus  urlbase Basename prepended to URL on output     string                          https://www.gpsbabel.org/WEB_DOC_DIR/fmt_saplus.html#fmt_saplus_o_urlbase
-
-option saplus  prefer_shortnames       Use shortname instead of description    boolean                         https://www.gpsbabel.org/WEB_DOC_DIR/fmt_saplus.html#fmt_saplus_o_prefer_shortnames
-
-option saplus  datum   GPS datum (def. WGS 84) string                          https://www.gpsbabel.org/WEB_DOC_DIR/fmt_saplus.html#fmt_saplus_o_datum
-
 file   --r---  saroute anr     DeLorme Street Atlas Route      saroute
        https://www.gpsbabel.org/WEB_DOC_DIR/fmt_saroute.html
 option saroute turns_important Keep turns if simplify filter is used   boolean                         https://www.gpsbabel.org/WEB_DOC_DIR/fmt_saroute.html#fmt_saroute_o_turns_important

diff --git a/reference/help.txt b/reference/help.txt
index 82ad34032c5e1e0dfcd83bffcd290511eae804ea..2abf4603459b4671c52446318324ecc3f71f799d 100644 (file)
--- a/reference/help.txt
+++ b/reference/help.txt
@@ -66,15 +66,7 @@ File Types (-i and -o options):
          urlbase               Basename prepended to URL on output 
          prefer_shortnames     (0/1) Use shortname instead of description 
          datum                 GPS datum (def. WGS 84) 
-       gpl                   DeLorme GPL
-       saplus                DeLorme Street Atlas Plus
-         snlen                 Max synthesized shortname length 
-         snwhite               (0/1) Allow whitespace synth. shortnames 
-         snupper               (0/1) UPPERCASE synth. shortnames 
-         snunique              (0/1) Make synth. shortnames unique 
-         urlbase               Basename prepended to URL on output 
-         prefer_shortnames     (0/1) Use shortname instead of description 
-         datum                 GPS datum (def. WGS 84) 
+        gpl                   DeLorme GPL
        saroute               DeLorme Street Atlas Route
          turns_important       (0/1) Keep turns if simplify filter is used 
          turns_only            (0/1) Only read turns; skip all other points 

diff --git a/style/saplus.style b/style/saplus.style
deleted file mode 100644 (file)
index 76da425..0000000
--- a/style/saplus.style
+++ /dev/null
@@ -1,28 +0,0 @@
-# gpsbabel XCSV style file
-#
-# Format:
-# Author: Jim Bensman
-#   Date: 02/22/04
-#
-
-DESCRIPTION             DeLorme Street Atlas Plus
-
-#
-# FILE LAYOUT DEFINITIIONS:
-#
-FIELD_DELIMITER         COMMA
-RECORD_DELIMITER        NEWLINE
-BADCHARS                ,"
-
-PROLOGUE        Name 2,Name,Latitude,Longitude,URL,Type
-
-#
-# INDIVIDUAL DATA FIELDS, IN ORDER OF APPEARANCE:
-#
-IFIELD  DESCRIPTION, "", "%s"           # Name 2 (Big Description)
-IFIELD  SHORTNAME, "", "%s"             # Name
-IFIELD  LAT_DECIMAL, "", "%f"           # Latitude
-IFIELD  LON_DECIMAL, "", "%f"           # Longitude
-IFIELD  URL, "", "%s"                   # URL
-IFIELD  IGNORE, "", ""                  # Holder for Geocache Type
-

diff --git a/tools/nuke_format b/tools/nuke_format
index a33fe2f209a776b9f827d2a80073486eaf845226..ee010699f2a35d09c68845f51bd33fdbc2e2d99b 100755 (executable)
--- a/tools/nuke_format
+++ b/tools/nuke_format
@@ -29,6 +29,7 @@ remove_line $1.cc CMakeLists.txt
 remove_line $1.h CMakeLists.txt
 remove_line $1.cc GPSBabel.pro
 remove_line $1.h GPSBabel.pro
+remove_line $1 gpsbabel.qrc
 
 remove_manually $1 reference/help.txt
 remove_manually $1 reference/format3.txt
@@ -48,7 +49,9 @@ git rm -f reference/$1*
 git rm -f xmldoc/formats/$1.xml
 git rm -f xmldoc/formats/options/$1.xml
 git rm -f testo.d/$1.test
+git rm -f style/$1.test
 [ -f $1.cc ] && git mv $1.cc deprecated/
 [ -f $1.h ] && git mv $1.h deprecated/
+[ -f style/$1.style ] && git mv style/$1.style deprecated/style/
 
 # make && ./testo

diff --git a/xmldoc/formats/saplus.xml b/xmldoc/formats/saplus.xml
deleted file mode 100644 (file)
index 3f4a187..0000000
--- a/xmldoc/formats/saplus.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-      <para> This format is for DeLorme Street Atlas USA 2004 Plus and later.
-</para>
-      <para> For geocachers importing data from a tool like GSAK or
-Spinner, import the file twice in XData.  One will create a file with
-the Cache description as a hyperlink on the flag. This can clutter up
-the screen and when you try to zoom in, it causes problems.  So the
-second one will only have a flag. Thus you can turn off and on which
-one you want to view.  The first time you import the file, in the
-assign field types, check the circle above Full Name and then next.
-The second time you import the file do not check any circle and in the
-second to last column, change URL to none and then click next. Use the
-same name you used the first time but add -Flag to it.
-</para>
-